Fix duplicate service registration and simplify EnvFile logic by Copilot · Pull Request #12575 · dotnet/aspire

Copilot · 2025-10-31T21:48:54Z

Addresses code review feedback on the Docker Compose deployment PR.

Test fixes:

Removed duplicate IResourceContainerImageBuilder service registration in DockerComposePublisherTests.cs that would cause DI container conflicts

Code simplification:

Refactored EnvFile.AddOrUpdate to eliminate duplicate assignment in if/else branches by checking onlyIfMissing condition upfront

Before:

if (_entries.ContainsKey(key))
{
    if (onlyIfMissing) return;
    _entries[key] = new EnvEntry(key, value, comment);
}
else
{
    _entries[key] = new EnvEntry(key, value, comment);  // Duplicate
}

After:

if (_entries.ContainsKey(key) && onlyIfMissing)
{
    return;
}
_entries[key] = new EnvEntry(key, value, comment);

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

…EnvFile logic Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com>

* Initial plan * Address Copilot feedback: Remove duplicate registration and simplify EnvFile logic Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com>

* Add deploy support for Docker Compose * Fix duplicate service registration and simplify EnvFile logic (#12575) * Initial plan * Address Copilot feedback: Remove duplicate registration and simplify EnvFile logic Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Refine Docker Compose publishing: env file naming, log verbosity, and status messages (#12580) * Initial plan * Address PR feedback: Update env file naming, reduce log verbosity, and enhance success message Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Fix log verbosity: Move completion message to Debug level instead of task creation Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Fix passing of RIDs in dotnet publish for back-compat --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com>

* Add deploy support for Docker Compose (#12548) * Add deploy support for Docker Compose * Fix duplicate service registration and simplify EnvFile logic (#12575) * Initial plan * Address Copilot feedback: Remove duplicate registration and simplify EnvFile logic Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Refine Docker Compose publishing: env file naming, log verbosity, and status messages (#12580) * Initial plan * Address PR feedback: Update env file naming, reduce log verbosity, and enhance success message Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Fix log verbosity: Move completion message to Debug level instead of task creation Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Fix passing of RIDs in dotnet publish for back-compat --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Replace ContainerTargetPlatform.AllLinux with LinuxAmd64 (#12596) * Initial plan * Update ContainerTargetPlatform from AllLinux to LinuxAmd64 - Replace ContainerTargetPlatform.AllLinux with LinuxAmd64 in ProjectResource.cs (2 occurrences) - Replace ContainerTargetPlatform.AllLinux with LinuxAmd64 in ContainerResourceBuilderExtensions.cs - Remove AllLinux enum value from ContainerTargetPlatform enum definition Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Completed: Update ContainerTargetPlatform from AllLinux to LinuxAmd64 Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> * Restore AllLinux enum and revert unintended template changes - Restore the AllLinux enum value in ContainerTargetPlatform - Revert all unintended changes to Aspire.ProjectTemplates localization files Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com> --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com> Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>

Initial plan

c3b1e54

Copilot AI assigned Copilot and captainsafia Oct 31, 2025

Copilot AI mentioned this pull request Oct 31, 2025

Add deploy support for Docker Compose #12548

Merged

Copilot started work on behalf of captainsafia October 31, 2025 21:49 View session

Address Copilot feedback: Remove duplicate registration and simplify …

e2639fb

…EnvFile logic Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Add deploy support for Docker Compose~~ Fix duplicate service registration and simplify EnvFile logic Oct 31, 2025

Copilot AI requested a review from captainsafia October 31, 2025 21:54

Copilot finished work on behalf of captainsafia October 31, 2025 21:54

captainsafia marked this pull request as ready for review October 31, 2025 22:21

captainsafia merged commit e8b791e into safia/dcd Oct 31, 2025
2 of 3 checks passed

captainsafia deleted the copilot/sub-pr-12548 branch October 31, 2025 22:21

github-actions bot locked and limited conversation to collaborators Dec 1, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix duplicate service registration and simplify EnvFile logic#12575

Fix duplicate service registration and simplify EnvFile logic#12575
captainsafia merged 2 commits intosafia/dcdfrom
copilot/sub-pr-12548

Copilot AI commented Oct 31, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Copilot AI commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Copilot AI commented Oct 31, 2025 •

edited

Loading